btl/sm: fix wrong payload_buffer size during freelist_init (v5.0.x)#13498
btl/sm: fix wrong payload_buffer size during freelist_init (v5.0.x)#13498janjust merged 1 commit intoopen-mpi:v5.0.xfrom
Conversation
|
Hello! The Git Commit Checker CI bot found a few problems with this PR: b7cf4ce: btl/sm: fix wrong payload_buffer size during freel...
Please fix these problems and, if necessary, force-push new commits back up to the PR branch. Thanks! |
b7cf4ce to
406dbc7
Compare
|
Hello! The Git Commit Checker CI bot found a few problems with this PR: 406dbc7: btl/sm: fix wrong payload_buffer size during freel...
Please fix these problems and, if necessary, force-push new commits back up to the PR branch. Thanks! |
|
I’ve already added bot:notacherrypick to my commit message, but the CI still fails. Any idea why? |
It needs to be in the PR description, not the commit message. I updated the PR description, and CI passes now. |
|
That being said, isn't this effectively a cherry pick of f25ff21? |
I believe yes, bcs directly using the cherry-pick would result in three conflicts, and the modification only requires three lines, I modified it manually. |
Gotcha; fair enough. Can you modify your commit message to put the cherry-pick message anyway? Or at least mention that it's effectively a cherry pick (with conflicts resolved)? I ask because we harvest those cherry-pick messages in the commit messages to help track what has come over from master and what was missed, etc. |
Previously, freelist_init() used
payload_buffer = size + sizeof(btl_sm_frag_t),
but what we actually need is
size + sizeof(btl_sm_hdr_t).
More details can be found in issue(open-mpi#13404) [1].
(cherry picked from commit f25ff21,
with conflicts resolved)
Link: open-mpi#13404 [1]
Signed-off-by: Troy Mitchell <troy.mitchell@linux.dev>
406dbc7 to
f4580fb
Compare
I've already forced push. |
Previously, freelist_init() used
payload_buffer = size + sizeof(btl_sm_frag_t),
but what we actually need is
size + sizeof(btl_sm_hdr_t).
More details can be found in issue(#13404) [1].
Link: #13404 [1]
bot:notacherrypick